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