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