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