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

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



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