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