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