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