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