Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into rvc-qpr-dev

Auto-generated-cl: translation import
Change-Id: I5dbcafcca06381b60c05cfdb2ee0b745c88a8b57

Auto-generated-cl: translation import
Change-Id: Id49401c227b5707affd6b07b90f79690e4384ea4

Auto-generated-cl: translation import
Change-Id: I5a5b6676a580376ae20dc1713886f56d830760bd

Auto-generated-cl: translation import
Change-Id: I920db49c330b356d569f40a4d85303a67c15eb85

Auto-generated-cl: translation import
Change-Id: Iaf80e007e929c511d0af1afbfc6343debfbd3814

Auto-generated-cl: translation import
Change-Id: Ie1cbc3f141b21c2797464f00223bb5be3b5ae68f

Test: manual
Fixes: 180018342
Change-Id: Ia5057e23a9974ef8ff3652c50adc0216844a7099

This was broken in the original migration, causing this field to be
dropped on reboot.

Bug: 178209505

Test: TODO, separate change will include comprehensive parceling test

Change-Id: I67219fe00c7b92677391fd46305bf0424d74e5f3
(cherry picked from commit 00f69942)

CpuTimePerUidFreq puller kept the input array with CPU times to avoid
copies, but that array is owned by the reader and is mutated for each
callback invocation. This corrupted the aggregated data.

Bug: 157535126
Test: cmd stats pull-source 10010
Test: atest CpuStatsTests
Change-Id: Icda6a71f558e582c5d5b497e2cca1d84deed8b99
Merged-In: Icda6a71f558e582c5d5b497e2cca1d84deed8b99

This keeps it synchronized with dismissal and thus avoids
a race between pending and sync transaction application

Bug: 170801863
Test: launch a forced-multiwindow sizecompat app in split and
      then dismiss split to that app. App should not be cropped.
Change-Id: I686605928ededcd5c5d032789fd883e17f437948
Merged-in: I4d89be443af5616174ea44e62774133e3b99597c

Freezing and unfreezing don't reqiure the AM lock when freezer is not
enabled.

Test: boot, no lock contention on unfreezeTemporarily
Bug: 161866124

Change-Id: Ic650456aa8938db38b368042ce3f42fa43e7a130
Merged-In: Ic650456aa8938db38b368042ce3f42fa43e7a130

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9 am: 3516e98d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc3424fffffc3751faf53f8ca87d2c94864ce23

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours am: 6766245f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb89ffd735b559380e1ce321b0a8d1170ab44f2e

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 67596632 am: a9641173 am: 8eef0f9d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c4cc928f634c0dfdc3ec3d036c8c5dfc0bb7167

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifda810cfa71d212d92dd63ab052136e8fe5e723a

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours am: ebde0f1f -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ba88ee303eb38e19d124331abfda6e09a14afdf

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bc4d6f366fab119da399da1a1a37024c4717dde

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4952f07571992a24f29a80063cd205b54592a5a1

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043

Safeguard /proc/locks processing from wrongly formatted /proc/locks
files

Bug: 179171387
Test: could not reproduce the issue, but verified that no crashes
occurred in a prolonged test (4hrs+)

Change-Id: Ia8a12903f2e520e51780c8b05876aa1c9083e92b
(cherry picked from commit fb4f4073)

This is safe, as getCommittedStatsMerged() supports null-able values for the List<ParcelFileDescriptor>.

Test: local compile and test; atom still pulls successfully.
Change-Id: I083ea1150f54c5970fbf60ae320809d27c4f3207
Merged-In: I083ea1150f54c5970fbf60ae320809d27c4f3207
Bug: 179008261
(cherry picked from commit e451771a)

ActivityMetricsLoggers build the proto with the compilation reason first
and then the compilation filter. Instead of changing the logging code,
we prefer to change the proto field order: this will facilitate the
speed up the resolution without the need to purge data or wait for
further release builds.

It is ok, because both fields are in fact int32 proto values so the ABI
does not change.

Test: m
Bug: 178108751

(cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2)

Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Change-Id: I03c701efe2181ae7796547267902f884007593eb

Bug: 173421434
Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40
Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8