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