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