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

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

Change-Id: I4503c3deea82643b17975e35edd3d97cf09c9caf