Merge "Merge "Correctly throw AssertionError" into oreo-cts-dev am: 9c9aafc509" into oreo-mr1-cts-dev am: e0bc0adcac am: 699256d7fb am: 7ee7c97d0c
am: 793a4d6e74

Change-Id: Ib22db6d1fd5e01082603a31c2ea6589dad303e6b