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