[automerger skipped] Merge "[DO NOT MERGE] Send dim layer in input list" into...

[automerger skipped] Merge "[DO NOT MERGE] Send dim layer in input list" into tm-dev am: 2465d489 am: 393cd472 -s ours am: fbc5cb43 -s ours am: 4d6eadc8 -s ours am: 7dab1d6e -s ours

am skip reason: contains skip directive

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



Change-Id: Icc86f1d8b86d2fb3f99ead52933cc11486ba948c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>