[automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 da12e7f732 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476
Change-Id: I11b25c0832d6959e77bbabbfce53cdedce922279
This commit is contained in: