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