tree 51860e625dc9b3d963e2e1fb80482ac48b59db2f
parent 1fa0cb1ed050c2b4e027e1958e94efcc22af1de5
parent 498a92aac89a0e6b6a19a08a1d44adfbacc43497
author Junyu Lai <junyulai@google.com> 1643130719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643130719 +0000

Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" am: a6889ec04f am: 498a92aac8

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

Change-Id: I4503c3deea82643b17975e35edd3d97cf09c9caf