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