Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency" am: 6dc2fbcf27 am: c8e96a462d am: 62658a4613

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

Change-Id: I90368600bff5374a03122b343d93743d7b3eea80