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