Merge "Cleanup step to reverts the USE_FULL_SCREEN_INTENT app op mode to...

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: a938b396

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



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