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