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