[automerger skipped] [resolved conflict] Refine permission check process of...

[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f706 am: 5d50556c -s ours

am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22505800



Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>