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

* changes:
  Merge changes from topic "aris-backport-rvc-dev" into rvc-dev am: b612e74d am: 617829cf am: 3086ddc5 am: 998e741c am: dbfff411 am: cfc1526a am: dd4c9e82 am: ea4c3633
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 73ee4cb9 am: cbcfab9b -s ours am: 2de6d640 -s ours am: 83b662a6 -s ours am: 57a2558f -s ours am: 28d1127d -s ours am: f23c5563 -s ours am: 04b928b7 -s ours