Android O MR1 IOT Release Smart Display r3 (OIM3.180907.022)
Merge "Work around bugprone-exception-escape bug."