DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5 -s ours am: bcb7e32954 -s ours
am: eb7b7664cb
Change-Id: I261c10f930d32c6d69d0ced4d0d7d81f3357cf63
This commit is contained in: