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