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