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

Change-Id: I6a6d0f4da385f7633dcd787a35b5efebf3dc38af