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