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