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