Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4 am: 6c1f3fbc am: 1ff8962b am: 70398d20

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

Change-Id: Iaef6f3bd68561b879bf0d1600b7296b5c39b225a

Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4 am: 6c1f3fbc am: 1ff8962b

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

Change-Id: Idc81838d965832f5d97af67e0006565fe93a3a76

Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4 am: 6c1f3fbc

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

Change-Id: I24500f0428749baf7e1da43464982c1bd15c28f2

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

Change-Id: Iaa3eaadd033a9b839cc8f74e0de3f10cd37e428e

Test: CTS tests
Bug: 189885848
Change-Id: I2fe1994e986e55f9a7ae063abf78ebfe8aaeb47d

[automerger skipped] Merge "*ServiceStartNotAllowedException shouldn't have a "cause"" into sc-v2-dev am: 74c94435 -s ours am: 4a7c2115 -s ours

am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 d4396b9a is already in history

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

Change-Id: I2bbdc56560eae607dcd581793b84a7fc60bf1d33

[automerger skipped] Merge changes from topic "presubmit-am-8bb7303602ce4e5599c16939f20f4126" into sc-v2-dev-plus-aosp am: e098aec3 -s ours

am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 fc3ec92a is already in history

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

Change-Id: If3df50f6918f79637d7a8cd2d17d99c3678096f7

Merge "Allow extra keyguard logs to be enabled via adb" into sc-v2-dev am: c5e184b5 am: b287cd51

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

Change-Id: I8e072b4bf7b31826d629fb0d6f9ffe790d5f225d

[automerger skipped] Merge "*ServiceStartNotAllowedException shouldn't have a "cause"" into sc-v2-dev am: 74c94435 -s ours

am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 d4396b9a is already in history

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

Change-Id: I22526ab8af8a1f8db543ed18b3a5fbf8fea61e06

Merge "Create owner test files for subpackages" am: 9e8cfbac am: 05bc30f2 am: a39bb54f am: 9e5539c7

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

Change-Id: Idee1d783a52db16a7fb7aeadb11b69564e72aca5

* changes:
  [automerge] *ServiceStartNotAllowedException shouldn't have a "cause" 2p: d4396b9a
  *ServiceStartNotAllowedException shouldn't have a "cause"

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

Change-Id: I5f57d9ff1f71dd2e78af5e3accf7f5df6f5ffd46

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

Change-Id: I94c28df75a0af1ea24dcc388fee84c093268ffd0

Merge "Include MIDI service OWNERS for internal/midi" am: f5bf153f am: 191c4bd7 am: bba74c1c am: ba160b15

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

Change-Id: I906b6e6f0d3e8a007458dc55ab4f51c510be0255

Merge "audio: Fix possible NullPointerException when DEBUG is true" am: 4d738300 am: 18b3180f am: 18062a45 am: 514d2e8f

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

Change-Id: Ice90cf95296b3fd714c875ae0a89c03a6dc29f08

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

Change-Id: I5a4f26de3f474fe5794d94ca1f581b317ac1bb37

Merge "Add OWNERS files for AttestationVerification in frameworks/base/core/java/android/service/." am: 4939f35b am: aca72963 am: 47b398bc am: 3411e812

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

Change-Id: Ia15c4bcdf2c5dac99efbbcc5208fe6ecb81a5c6d