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