Merge "[MS47] Remove INetworkStatsSession from DataUsageController" am: 5d131ef4c4 am: 445203d3d0 am: 0b6cc23466

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

Change-Id: I4127b23df8e2f684f8d179a330c9145eb03f099c