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