Merge "Merge "Bypass instant app resolution when NON_BROWSER specified" into...

Merge "Merge "Bypass instant app resolution when NON_BROWSER specified" into udc-dev am: af6326c8 am: 813bee9c am: 6b27ac99" into udc-qpr-dev-plus-aosp am: b5926a30

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



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