[automerger skipped] Merge "Cleanup step to reverts the USE_FULL_SCREEN_INTENT...

[automerger skipped] Merge "Cleanup step to reverts the USE_FULL_SCREEN_INTENT app op mode to MODE_DEFAULT if the permission flags for the USE_FULL_SCREEN_INTENT permission does not have USER_SET." into udc-dev am: 2256e4ba am: d5a17025 -s ours

am skip reason: Merged-In I08415b0198d1c7ac88676832fb0a003336af6881 with SHA-1 e4b8b47e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23065541



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