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