Merge changes from topic "revert-3085486-cherrypicker-L33500030003548614:N45100030056225643-AHBLMNZHOI" into main

* changes:
  Revert "Fix LargeTopAppBarNestedScrollConnectionTest for ag/26995613"
  Revert "[STL] Address API council feedback on ApproachLayoutModi..."

Bug: 317747397
Test: m libvintf_jni (installs vintf as well)
Change-Id: I9615c923e045eb07387eb75421e724f912856d86

This reverts commit 831334bd.

Reason for revert: Droidmonitor triggered revert due to b/341375758.

Change-Id: I9aaf3e0bca1d173ea7f449339185db5ace780626

Revert submission 3085486-cherrypicker-L33500030003548614:N45100030056225643

Reason for revert: Droidmonitor triggered revert due to build breakage in b/341363560. 

Reverted changes: /q/submissionid:3085486-cherrypicker-L33500030003548614:N45100030056225643

Change-Id: I08e6857f1dc2afe6f25e8ed757b641d44a639c4e

Revert submission 3085486-cherrypicker-L33500030003548614:N45100030056225643

Reason for revert: Droidmonitor triggered revert due to build breakage in b/341363560. 

Reverted changes: /q/submissionid:3085486-cherrypicker-L33500030003548614:N45100030056225643

Change-Id: I04e20626d5c410e4dfd8d41a141af50a4df426f3

Bug: None
Test: presubmit
Change-Id: Iaf8ed5e440b5514c68d09e803a6fd6a6a0944245

TypedArray instance was not closed after creation due to recycle method not being invoked. Added recycle call.

Bug: 337976070
FIXES: 337976070
Change-Id: I222e33209e6b66f344e24ae1ca232ca7312da087

In case of crash loops with a short time mainline rollbacks don't finish before the next mitigation which is warm reboot.

Change-Id: I77a487cb27e4254865ba2cc045e379dcb7348994
Test: unit and manual tests
Bug: 310236690

Merge "Use @EnableFlags and @DisableFlags annotations instead of soon-to-be deprecated methods." into main

Change-Id: Ib29eec5f4b6191b820f952f783f9ef9928385f7e

Previously, the `*api-stubs-docs-non-updatable` modules used either the
full previously released public API or a delta for those API surfaces
that extend another API surface. Just passing a delta meant that lint
would not be able to properly ignore issues that already existed in
previously released APIs.

This change switches them to use the `*.api.combined.*.latest` modules
which contains the full API for each surface, including the API
provided by any API surface it extends. That ensures that lint will
not report issues with previously released APIs.

Bug: 341078916
Test: m checkapi
      # Check that multiple --api-lint-previous-api options are passed
      # to metalava for system-api-stubs-docs-non-updatable
Change-Id: I8a6d1263086466fda111266fe8bfdfedf0f8c152

These tests are build with -Werror, so we need to migrate them.

Bug: 341129262
Change-Id: I0bd8d03f16f0fef1772826a24f663a7babe2bfcd
Flag: test_only
Test: presubmit
Merged-In: I7661dd73c3f9d0e44cabd928b96cf2affc9cae22

  When the hostsPackageForUser method return true,No nonNull judgment is made on the provider var which may be a null var.

Bug: 339747311

Merged-In: I00f8c12b5dec00eac6e50e2ef755742db3fe4521
Change-Id: I00f8c12b5dec00eac6e50e2ef755742db3fe4521

Existing callbacks in this method don't follow the `onXXX` pattern.

Bug: 340880042
Change-Id: Ic2060f1490645f21b726c3f4f18e66a75cca191b
Test: Compiles

Make it possible to use read only properties in the path when merging
an overlay config.

One of the usecases is to support switching overlays depending on SKU.

Example:
<config>
  <overlay package="..." enabled="true" mutable="false" />
  <merge path="${ro.my.prop}/config.xml" />
  <merge path="skus/${ro.my.prop}.xml" />
  <overlay package="..." enabled="true" mutable="false" />
</config>

Bug: 223913150
Test: atest OverlayConfigTest OverlayConfigParserTest
Change-Id: Ic9e460e5064a9601e713b3959a66a80bdf78734a

In aosp/3020232, the intermediateLayout was removed, while
isMeasurementApproachComplete has been changed to
isMeasurementApproachInProgress.

Test: No new test
Bug: 332591722
Flag: NA
Merged-In: I3b33480980331b20f2e6e0f66f03b2e5dcda253b
Change-Id: I3b33480980331b20f2e6e0f66f03b2e5dcda253b

Change-Id: I956280d49da8d35a4c42b7d96360258aefe3576e