Merge "Don't show intent picker when using camera attachment in a Managed Profile." into tm-dev am: fd45ea35 am: 952f9c5f

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

Change-Id: Id684f78ed5a167298128ea602839d7e6abaafa65