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