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