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