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