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