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

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

Change-Id: I965b8795a738419d2f9e3759f04d29d3e64174ca