Merge "Correctly throw AssertionError" into oreo-cts-dev
am: 9c9aafc509

Change-Id: I8c39ede668f71efe5d3a8fa8b55c5037a13726f5