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