[automerger skipped] Merge "[RESTRICT AUTOMERGE] Dimming on an embedded...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Dimming on an embedded TaskFragment vs. parent Task" into sc-v2-dev am: 446346bc am: 1f89946f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie9163a25c1c23822737e93a96660787013de57db