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