[automerger skipped] Merge "Add test coverage for NetworkStats.Bucket#getRoaming()" am: 23f5e54efa am: b3d3f43942 am: 7601273976 -s ours

am skip reason: Merged-In I16778488540476c2d1e77378a020c548eb894f0a with SHA-1 50b5233060 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2017915

Change-Id: I5dc97a183aa67a22fa4c9d8a0a6b4ba9091e2bac