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