Merge "[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a30457 am: ea36a0c236 am: 043a322e4d -s ours am: 29eef120e2 -s ours am: b984203cb2 am: 0482ee7eed -s ours am: 6d513e3306 am: dca36e934b am: 5141d72634" into rvc-qpr-dev-plus-aosp