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