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