Merge "Bypass instant app resolution when NON_BROWSER specified" into udc-dev am: af6326c8 am: fd7d6c00

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



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