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
tree: 51860e625dc9b3d963e2e1fb80482ac48b59db2f
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/