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