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