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