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