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