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

* changes:
  [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a0 am: d6b9cb35 -s ours am: c9d18836 -s ours am: a173229e -s ours am: f6d78a96 -s ours am: 4db2250a -s ours am: e72dd250 -s ours am: a5cc3212 -s ours am: f12425b3 -s ours
  [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9 am: 2b28fb61 -s ours am: e83cda5d -s ours am: d7e777c2 -s ours am: 422897e9 -s ours am: 079112b6 -s ours am: 33655205 -s ours am: 3f7e913c -s ours am: aac7a636 -s ours