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