Android Q Preview 1 (QPP1.190205.018.B4)
Merge "Revert "Work around bugprone-exception-escape bug.""