Merge "Restrict what activity launches show permission prompts" into tm-dev am: c4293b56e2 am: ebf09d10ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943827 Change-Id: I34f349183bd73e485ad8ee44326867b9497e1834
This commit is contained in: