Only 1 carrier requires memory retention based on the pcell.
Change this config to be false by default so most carriers
will use the timer to extend NR advanced instead of pcell.

Test: atest NetworkTypeControllerTest
Test: manual basic functionality tests and verify no regressions
Bug: 294088690
Bug: 297307822
Change-Id: I3be9e784607923ff132f58942490e1be3b6757ea

Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed813 am: 2367dc86

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



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

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



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

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



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

Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed813

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



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

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



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

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



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

[automerger skipped] Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191 am: 55d09197 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 10d75fc5 is already in history

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



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

* changes:
  [res] Speed up AssetManager pointer locking
  Reland "Use reference counted pointers for ApkAssets"
  [res] Better native pointer tracking in Java

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



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

Merge "Modifies getMslAltitudeMeters and getMslAltitudeAccuracyMeters in android.location.Location to no longer throw IllegalStateExceptions when corresponding values are not set." into udc-qpr-dev

Ensure the mHintSessionFuture is accounted for correctly in the
destructor.

Bug: b/297230599
Test: manual
Change-Id: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
Merged-In: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
(cherry picked from commit ac620f64)

Bug: 297585698
Change-Id: If41f132d5000eeaf60f2ee75400cda09f1f97ec4
Signed-off-by: Jon Eckenrode <joneckenrode@google.com>

Merge "Adds intent extra to package data clear broadcast during restore operation." into udc-qpr-dev

This reverts commit 8d9ef830.

Reason for revert: This is incorrectly disabling Rollback

Bug: b/287568263
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:42783c9fbec0ac2f8aede663c74e3cf91ee2646b)
Merged-In: If5612bd68cd0ba7c3b9e9f68dac84be3f1482164
Change-Id: If5612bd68cd0ba7c3b9e9f68dac84be3f1482164

[automerger skipped] Remove callback upon MediaSession#release am: 3cfa79c5 am: b68a7b78 am: 017d5586 -s ours

am skip reason: Merged-In I112fa5df6aafdb2774ed65c2d08ab1eb680e6b47 with SHA-1 9452bb9f is already in history

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



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

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



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

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



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

Fixes: 297963951
Test: Manual (see bug)
Change-Id: I53a27367b203f441572455df85f62e3ad46fa867

While sessions not getting destructed on CanvasContext::destroy()
was initially suspected as a culprit for a memory leak, there are many
cases where CanvasContexts are repeatedly destroyed then reused. This
caused excessive re-creation and prevented hints from being sent, since
hints can't send while waiting for the session, causing regression. The
session will ultimately get destroyed in CanvasContext's destructor, so
leaving these sessions active for the lifecycle of CanvasContext is
fine, especially since the session is usually getting reset before new
work comes in anyway.

Bug: 297604399
Test: uibench runs of regressed metrics
Change-Id: I209e40764d5bbcde85d709bccbc41f94f9c2ab49
Merged-In: I209e40764d5bbcde85d709bccbc41f94f9c2ab49
(cherry picked from commit 9f3654e6)

It's possible that a pending request is removed from
CaptureCallbackMap before its result is received.

In that case, the callback holder will be null. And we should
not dereference the null pointer.

A minor code cleanup is also made.

Test: Camera CTS
Bug: 295066682
Change-Id: I70b04ac4bb4bd4c5786677fd2117aa15eafafef6

Bug: 297981848
Test: N/A
Change-Id: I840944fff2c7966186843451b789fac0eefe4ae0