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