[automerger skipped] Merge "Set the offset of the dim layer of DisplayArea."...

[automerger skipped] Merge "Set the offset of the dim layer of DisplayArea." into sc-v2-dev am: 3c228ab0 -s ours am: 1dfb13d2 -s ours

am skip reason: Merged-In I8fd3494a3cd7ad6183ce6aa442e49f85b441c73f with SHA-1 b1bd4422 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16919251

Change-Id: I59d274e3c9123a1818bd2b3e0784ee099d972315