tree fed0ee14abe8506f27367873e5023a4932cdec77
parent 15c97991e799c20e99b284f6d2bff6f21e28f793
parent 4fa68e3b807d5db424cd1769e061b378186eb133
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1764135423 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1764135423 -0800

Merge cherrypicks of ['android-review.googlesource.com/3868117'] into androidx-xr-scenecore-pre-release.

Change-Id: I63d9cb6b7e353c9914dea54c48afd30f18cfe9b8