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