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