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

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

Change-Id: I280b54ef8b105ed5a0fc6107e47a78d60b915514