Merge changes from topic "am-28c2e2bbce384832a48243801699a27b" into tm-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: 5750dcd2 -s ours am: f9c2abf2 -s ours am: f1b49e2f -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: 68f44894 -s ours am: 9f2ef68d -s ours am: d41cd4c7 -s ours