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

* changes:
  [automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f am: be5aef03 -s ours am: 3c8562a7 -s ours am: 4a5df0c0 -s ours am: dbe17b14 -s ours
  [automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 22261fa6 am: eaf6143e -s ours am: 5f1dbe79 -s ours am: c087c9a5 -s ours am: 0427f027 -s ours