Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: ea43b62474" into rvc-d1-dev-plus-aosp am: 6223c48289

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

Change-Id: I65a8db74593d794c6efba6b70ae5e575cfce25d1