Merge changes from topic "am-7304460109c44279b5854a8caa06c38c" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev am: 838fc349 am: 47f5ba9a -s ours am: f9f8cebc -s ours am: 68eacf71 -s ours am: fcdeff82 -s ours am: cc408745 -s ours am: d24010b9 -s ours
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 74ce78df am: 61dbe88c -s ours am: 4a9d4427 -s ours am: c9252616 -s ours am: 86cb3ec2 -s ours am: edd73d27 -s ours am: d90514fa -s ours