[automerger skipped] Merge "[STL] Address API council feedback on ApproachLayoutModifierNode" into main am: cfd36ae7 -s ours

am skip reason: Merged-In I3b33480980331b20f2e6e0f66f03b2e5dcda253b with SHA-1 fd2d6657 is already in history

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



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