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