Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f am: 131d03d6 am: 057bac27

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363e8968ca7fc436228458a5239b909d8d156105

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d349a5f76f496503e328a4fc70e051a2ccca2b6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0bd75b8a65fc39288a6f92e8d5473060ccbd95

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b38edb7136852c5ecf78e0a4ad0266c77a453a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e071da6ca9f3cbd3b6353b9f0bd817b8186d31

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4796325c84396082256cec7c66fd1efdc623d36

Merge "New API for getting uids have specific permissions from SystemConfig" am: b8d9e77b am: ee109d8f am: 81d3a2bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b6f2e648865cb50d8987092db78c06d2b2b3a91

Merge "New API for getting uids have specific permissions from SystemConfig" am: b8d9e77b am: ee109d8f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If61fdc1cab61c9510ac3ae0ba193c45f9b59925e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74be68b10c791d19a3b4287a91bcc1d1c174f647

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 08771516 -s ours am: ff962af4 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1908efca9886eb6ece5afb6c3b08e6f982da6511

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 08771516 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d036597e2eae1be2c96f99e3dd115a3f5749135

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f249209 am: 23d31b02 am: 952d747c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6d8d56a79bd7f8751c3604a292f2bb8c34fd765

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92df8ef58e30ddefb84001a0b45363e82fdd3621

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4def0ebbf3f8c9e068fd768a090b25ee04333333

[automerger skipped] Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into rvc-qpr-dev am: 19c43a01 am: e0f72d91 -s ours

am skip reason: Change-Id I083ea1150f54c5970fbf60ae320809d27c4f3207 with SHA-1 e451771a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I552718f42ad1fdf7136a1e1b7b1e87c7707b9399

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b3f28ec38ac5f712556c3495ac80b7cc9e94eec

Merge "Move the VPN code out of packages/Connectivity." am: 8269d21d am: 6011d524 am: f684b8d4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acb8b9e93f839986aa6580832f1cdab12b3baf2

[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac am: 8cec61d8 am: b79cddd6 -s ours

am skip reason: Change-Id Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 572d2ec8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51

Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 9efa7780 am: 0b263af1 am: fe0e96c0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88648d8cab6081c178ecdd3b38935658a78b78dc

[automerger skipped] Merge "Centralise logic for setting credential manager app" am: 353a2c4f am: 6cf93cd8 am: a90997e6 -s ours

am skip reason: Change-Id I4290bccf5ae04de0d84c7091729e86704b937295 with SHA-1 392e1e23 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e0be56eda9bad8d2e5948d533de48147ef5bd7e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a30fde30df3230b3f4e7264480c8d6cd48595ff

am skip reason: skipped by user reminv

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib30e82ec8ee260c65332f4833be2e8aead4d93e5

The creation of the VibrationThread does some setup for the WakeLock
that the thread must hold, which should only be executed after the
Binder calling ID has been cleared.

The necessary checks for this operation are already done by the method
enforceUpdateAppOpsStatsPermission, so the VibratorManagerService should
be able to setup the thread wakelock at that stage.

Fix: 180324695
Test: manual
Change-Id: I2f203fc4c7ba78687e9159af93b3d1acd9c826c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0acc30c79574ff6a00cb4cc5334b82d0e9b01e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85de3f465b440b14ce0535bbd22ed6b76001c553

Devices updating from R will still use the old version reboot escrow
data. We need to have the backward compatibility to avoid the one-time
failure.

Bug: 178646806
Test: atest FrameworksServicesTests:RebootEscrowDataTest;
Apply an OTA from SP1A.210114.001 to local build with fix, RoR succeeds.

Change-Id: I320966340faa80b97f79e732fb728260dfa1cee8