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