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