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