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