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