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