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