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