Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581 am: f8cd65936d am: 6e1ffdc503

Change-Id: I37b2a020e67a9cf39626ab6039ba98b316b9d13a