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