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