tree 16fc0a6d7635782ea3a99ec887eaf2bdd47867bf
parent 3ddf671812978e80997835e91b83af6321633264
parent c1dec584a276dbedb2e99d3439632ac39fe29e97
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1652744487 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1652744487 +0000

Merge "Merge "Merge "Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev am: 6f05e37e28" into android12-tests-dev am: ea0da8adbc" into android12L-tests-dev am: 3e8d5f75b0" am: e7e9fb9811 am: c1dec584a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609

Change-Id: I3d8b9e6085e818c48c257d2af85446b9286afa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>