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

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

Change-Id: I34f349183bd73e485ad8ee44326867b9497e1834