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