am skip reason: Merged-In I74cc61fd87819be7302590d788c3c230bff57544 with SHA-1 b84e4c0b is already in history

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



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

Test: followed these steps:
1. Patched in https://r.android.com/2688146
2. m sysuig
3. Fix compilation issues
4. Repeat 2 and 3 until done

Fix: 294098415
(cherry picked from commit 162280b4)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:549f19a8a5653972af79f39178091d985e757407)
Merged-In: I74cc61fd87819be7302590d788c3c230bff57544
Change-Id: I74cc61fd87819be7302590d788c3c230bff57544

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Merged-In: I0736e8abf503c80b92e3762bed908400ffedb335
Change-Id: I0736e8abf503c80b92e3762bed908400ffedb335

This is meant to be a minimal fix for kotlin nullable error that was
exposed by setting the retention of android.annotation.NonNull and
android.annotation.Nullable to class retention by making it match the
PermissionManagerServiceInterface interface and not needed when
ag/23509136 is present.

Bug: 329087767
Test: builds
Merged-In: Ib3358be57d7dd401fd2014ade3e58f9fc6c2b6a7
Change-Id: I720bfa787a86966df8501b60cecf8c0726a919ef

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37a0857d61b9e10abe3de1463ffdf4b1d7d5d333)
Merged-In: I8113aa76a60904bc70211f95b1e4c05d11e4ae85

Change-Id: I8113aa76a60904bc70211f95b1e4c05d11e4ae85

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9de59d6e94521e39bb5c30ec3e4d576e06a93df7)
Merged-In: Ia6e9d146eb5fd31b1c27664080c50398a147b1e4

Change-Id: Ia6e9d146eb5fd31b1c27664080c50398a147b1e4

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3413858f14bf7398453603a8df50a8a9169f6a4)
Merged-In: I35530e7ed63a647c39018ef0ee850ceea4dbc0ba

Change-Id: I35530e7ed63a647c39018ef0ee850ceea4dbc0ba

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8db9adf852b00b403ae3e5b38a6f5d07d6c7a4b3)
Merged-In: Ia506c8d7b0a9009ada822108b9d85907ac18db2c

Change-Id: Ia506c8d7b0a9009ada822108b9d85907ac18db2c

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2522501d5b4b4eab8d20986aa1c4b6ed36640211)
Merged-In: Icfec5d0e20b534d7af9aeb1b539a711db76d5e5c
Merged-In: I79b5d963079237b70012b4db717620fb757bfa0d

Change-Id: Icfec5d0e20b534d7af9aeb1b539a711db76d5e5c

This API is being added due to API consumer feedback. The consumer
(credential manager team) needs this API to show an extra button on
BiometricPrompt as well as device credential (PIN/pattern/password).
With this new class PromptContentViewWithMoreOptionsButton, this button
will be added in the content view, which is an alternative to
description or verticla list content view.
The text of the button on this new content view class is fixed to be
"More Options".

Flag: ACONFIG android.hardware.biometrics.custom_biometric_prompt DEVELOPMENT
Test: atest BiometricPromptContentViewTest
Bug: 328843028
API-Coverage-Bug: 328843028

Change-Id: I5b4df32d70ea87d035cf918f94a96c6e91e7aa23

This API is being added due to API consumer feedback.

Flag: ACONFIG android.hardware.biometrics.get_op_id_crypto_object DEVELOPMENT
Test: m CtsVerifier
API-Coverage-Bug: 307601768
Bug: 307601768
Change-Id: I52009535645aab4466f0e3b3522de4fde0d01da0

Merge "MediaCodecInfo: Change default alignment and block size to 1x1" into main am: fa33da55 am: 29edabbf

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



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

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



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

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



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

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



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

Merge "Revert^4 "Enable default background network restrictions"" into main am: 00450bf1 am: 4ab4fbba

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



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

Merge "Fix crash on potentially missing CarrierConfigManager [TelephonySubscriptionTracker]" into main

We need it to make KeyguardOcclusionInteractor work for Flexiglass
(which is in followup CL(s)).

Bug: 308001302
Test: verified that flexiglass can be turned on and off using
go/flexiglass-script after cl/615924471
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: Ic194d97ac5b4a3a03e1c97c5aa14f1d96c74b181