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