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