Merge changes from topic "am-40bed6161b4d4ad69b276c380d19e8bf" 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: 7093cdc4 -s ours am: 267af82f -s ours am: 2c715513 -s ours
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 74ce78df am: 61dbe88c -s ours am: 4a9d4427 -s ours am: b25ca32d -s ours am: cead4f64 -s ours am: 6767b1f0 -s ours