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