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