Merge "Allow instant app resolution for any user" into oc-dev
am: e7b806e9d2

Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d