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