Merge "Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285b9" into main am: 6b55c28f0f

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

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