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