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