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