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

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

Change-Id: I0156271911c12dfd90000cc98fea4bb5edcad9bd