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