Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite." am: 888c3b03 am: f5c7e1b9
am: 8da67c75

Change-Id: I46c9b304a1445f0f6b51e64e7e6b01a6aa3653c8

am: f5c7e1b9

Change-Id: I2e584c87d94b130ff6f68da2392fe752a9c36694

am: 888c3b03

Change-Id: I7e34770fbce6713e560cb5c7bae6292c58c908e1

am: 0236cfd9 -s ours
am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 288b71c8 is in history

Change-Id: Id8d3faca2777e21cd0269adb828efb30bfd3e3bc

am: 3844bc14 -s ours
am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 1f1c25e8 is in history

Change-Id: I65a728f3b46bf99dac6878f6c170bd4d72484d95

am: d4e90d2e -s ours
am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 1f1c25e8 is in history

Change-Id: I59e092218b462a2505a5522de8713a7fc584070d

am: 270dc6ab

Change-Id: I210058d65ed329265bb5b2bb5371f0b8098eb4b3

am: 1c28a1aa

Change-Id: Ie62535304ba68db625aa075c28273b5aff84b228

[automerger skipped] Merge "Add hook for JVMTI agent in system server" am: 957ac164 am: a9cc5cf8
am: 7eb1d425 -s ours
am skip reason: change_id I299dffb1774fdce48b9b695a614b7ab60f1307e2 with SHA1 1a88539d is in history

Change-Id: I141bce505e17a8f578ac3c3cb4ddfd47ec6adfa7

am: a9cc5cf8

Change-Id: I59491078b65f4df90d0066adcc825f2303ee32e2

am: 0d0bfc92

Change-Id: I7012673fdf97ddaa5bad49387b3d974ac72daa02

am: 957ac164

Change-Id: I939ee4631cb7f1d0391a2fe007545086de24bef5

To avoid merge conflict with internal branch.

Test: make
Change-Id: I04636443ea70f0cbac784a910c3d57fa80bd6bcc
Merged-In: I1b750751148925b4a7bd94553318907654012fc1

Test: atest -p frameworks/base/tests/ApkVerityTest:presubmit
Bug: 112039386
Change-Id: Ic814bc5e5c51e581684968f8f20632a4fbffc8f4

am: 3fd00d01

Change-Id: I39238834ca46407e973181de3446ba11ab9b144a

am: 64bd53d5

Change-Id: I9546b107449a1027ae94133a1dcaa740c45db4a0

am: 560f980b

Change-Id: I95342d5ba3c7efa049287d6e7a73a1bfd81b6d75

Merge "[automerger skipped] Merge "Allow tuning of heaptargetutilization" am: 0e3e2a73 am: e673072f am: f74eb32c -s ours am skip reason: change_id I19680ff5fa1ebf9dfd4a3f71533d03510f4da414 with SHA1 b2910d3b is in history"

am: f74eb32c -s ours
am skip reason: change_id I19680ff5fa1ebf9dfd4a3f71533d03510f4da414 with SHA1 b2910d3b is in history

Change-Id: I56e13d7d4df0f159c7aa9a655e3cd831b610e306

Add a place to attach a jvmti agent into the system server in debug
builds.  This allows profiling and other investigations for performance
improvements.

Bug: none
Test: attach agent, collect result
Change-Id: I299dffb1774fdce48b9b695a614b7ab60f1307e2
Merged-In: I299dffb1774fdce48b9b695a614b7ab60f1307e2
(cherry picked from commit 1a88539d)

* changes:
  Remove some keyguard methods out of ShadeController
  Move dozing related methods out of ShadeController

* changes:
  Critical fixes for AndroidPackage migration
  Revert Revert PackageParser#Package fixes
  Revert "Revert "Deprecate PackageParser#Package""

Merge "[automerger skipped] Merge "Remove usage of hidden API PhoneConstants.SUBSCRIPTION_KEY" am: 52b8e3e4 am: 45e13fcc am: e2dc83dd -s ours am skip reason: change_id I437ebf67bd27e2ac69b2b7784d98d7683350652c with SHA1 b752a475 is in history"

[automerger skipped] Merge "Remove usage of hidden API PhoneConstants.SUBSCRIPTION_KEY" am: 52b8e3e4 am: 45e13fcc
am: e2dc83dd -s ours
am skip reason: change_id I437ebf67bd27e2ac69b2b7784d98d7683350652c with SHA1 b752a475 is in history

Change-Id: I681dbf2963b34975240ea65795e0d9422359fd43