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