Merge changes from topic "presubmit-am-f6a3dc4aa5e04877a31cf3a49c4a0612" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Set the offset of the dim layer of DisplayArea. 2p: b1bd44227c
  Set the offset of the dim layer of DisplayArea.