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