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