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