Android CTS 6.0 Release 30 (4844167)
Merge "Suppress clang -Wc++11-narrowing warnings."