Merge "Restrict what activity launches show permission prompts" into tm-dev am: c4293b56

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

Change-Id: I0ef22b51043c2b5c7904cd47a585d38186c09c18