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