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