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