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