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