[automerger skipped] Merge "Add unit test for...

[automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e77 am: 4535e1dd -s ours am: cf15e30f -s ours

am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 e4e86e1c is in history

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

Change-Id: I2058092be5426269fc93e209517a0d01c2fab1ec