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