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