Merge "[MS63.1] Remove TrafficStats.TAG_SYSTEM_DOWNLOAD dependency" am: a312a961e0 am: 78f8ec3696

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

Change-Id: I1250e9246ca66cc660605510d22187c5886cb625