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