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