Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" am: 0cc43d72c6 am: 35f59e774d am: b9fd1e1104

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

Change-Id: I9199f39b01a37a76bec2a6601de193d860a85a27