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