[automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours am: af780315ab -s ours am: e1b50696e0 -s ours am: beff4c52a9 -s ours
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476
Change-Id: I02a95fbeddc4dda3efa8ed93c3b92de28bb756f4
This commit is contained in: