[automerger skipped] Merge "[STL] Address API council feedback on...

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

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

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



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