[automerger skipped] Merge "Refine permission check process of 2-pane deep...

[automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2 am: 2e82189b -s ours am: b286a740 -s ours

am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c406 is already in history

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



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