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