Bug: 214053959
Test: manual

Change-Id: Ie77080d20f638e5e6e0a6ecb255d45bdb12f3c4d

Merge "[MS43] Remove EventLogTags depdendency" am: ea6321a1 am: 1529463a am: faa577b2 am: fd3f83b5

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

Change-Id: Ibc3cd5be58f46e569d645b42829cc1d7edab974b

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

Change-Id: I79a05cfe449db21fc4cfc48aed012224a8b3affc

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

Change-Id: Idcb86db0f3bdd298dbba16781e300b48ee30e94b

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

Change-Id: I270fb1b22e454509b96f9886dd58f55e407961e2

Inline functions and copy constants to the service.

Test: TH
Bug: 204830222
Change-Id: Idf5c8ff7c7fec39530269b3c6b24475407198fbc

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114 am: 94964fc7 am: 9101f315 am: 15b15867

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

Change-Id: I7ea215c9e5f6a2d95d5f17f643bb1fd6d7172044

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114 am: 94964fc7 am: 9101f315

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

Change-Id: Ie7ff2e152595480e30adc292b1373ada70d27f3b

Merge "Send Task Fragment Info Update When Task Invisible..." into sc-v2-dev am: 785ee1a5 am: 886ba350

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

Change-Id: Ief37df8d76c1739f43521f12b1c8c15e4d17e374

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5 am: 90d6cafc am: b0b2e115 am: c3de62bb

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

Change-Id: I757c9e684b9d1077573b6b705b151925a342e1cc

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114 am: 94964fc7

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

Change-Id: I0e39b9f7cd5ca8b68bc00d42a342ff21c9939749

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

Change-Id: Ia509c7c72338abd5028c2c8db6d572f642a637e4

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5 am: 90d6cafc am: b0b2e115

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

Change-Id: I7f36a7e3fd1f0293203dd06ababa8c852a1ffc8d

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

Change-Id: I83c00cee09a609e0be853dff3f2794e5b7da3f9d

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

Change-Id: Ic92bd41c9778bbd1bfce8598cb4b21c5b2e1e8ae

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

Change-Id: I2c3718d48073e2c07d269169effe90958c6f4a47

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

Change-Id: I7c73497ab7770240e8aadc96c3ef64e5c219cf75

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

Change-Id: I2e7b34abfe7769160c383a0774cf3bb9635c46e2

* changes:
  Fix missing group alertOverride recalculation
  Allow alertOverride if the summary GROUP_ALERT_ALL
  Fix the animation glitch when NSSL adds and removes a HUN in the same frame.

[automerger skipped] Merge "Add system_server to readtracefs group" into sc-v2-dev am: 63f3810e -s ours am: 59a24f9f -s ours

am skip reason: Merged-In I4139605eb7c5277887092b3d6a3fb26bf4f8f171 with SHA-1 57bbd009 is already in history

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

Change-Id: I59850f04c6f39adcb8584d7bea2a45660dd4cf6f

Merge "Makes it so changes to device state that have the FLAG_CANCEL_OVERRIDE_REQUESTS flag cancels all override requests"

- Image#getDataSpace need to be overridden in ImageReader class to get
the expected dataspace.

Bug: 214374988
Test: android.hardware.cts.DataSpaceTest
Change-Id: Id58783e1bd768456228a892051c5b52d846394da

[automerger skipped] Merge "Add system_server to readtracefs group" into sc-v2-dev am: 63f3810e -s ours

am skip reason: Merged-In I4139605eb7c5277887092b3d6a3fb26bf4f8f171 with SHA-1 57bbd009 is already in history

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

Change-Id: I731ce367049698eb07cb68857ba79cc982be2a22

* changes:
  Add new methods to TestHal.
  Add new methods to TestHAL.