Merge "Merge "CTS: Fix an assert error formater in Camera2 tests." into oreo-cts-dev am: 964dea29d2"