Merge changes from topic "am-05919bdbb64a446f8ab9085d9d866eaf" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-dev am: d624bcc0 am: 4d31f389 -s ours am: bb0c0633 -s ours am: 0dfcb15f -s ours am: 87788142 -s ours am: 97aa6218 -s ours
  [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: 88e98e0a am: d3e7a86d -s ours am: 6745e340 -s ours am: 42cb36e0 -s ours am: 82be2325 -s ours am: c238d416 -s ours