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