[automerger skipped] Merge "Merge "Revert "Making adapter child views in...

[automerger skipped] Merge "Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285" into main am: 6b55c28f am: 88e3bfc0 -s ours

am skip reason: Merged-In I0eedf4574975bfae88801e0153816135fc1c8181 with SHA-1 dc464d6e is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083

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



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