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