Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345 Change-Id: Ifa819b3296a90f9b15ff0246ada10530fb6534db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>