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

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

Change-Id: I9199f39b01a37a76bec2a6601de193d860a85a27