Merge from Widevine repo of http://go/wvgerrit/50560 There were some compiler warnings about converting true and false to integers in EXPECT_EQ which were solved by using EXPECT_TRUE and EXPECT_FALSE. Test: tested as part of http://go/ag/4674759 Change-Id: Ie55b53ce48301af64ee2dff04642cbda02c1c41e