f96d6fa4a15dffbf2eb30e5f367c7dbf0db18c9d
Cherry pick of commit ba41458f5c
plus changes to BitmapUtils.java.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I2effc3f498fb13e66de9a905b9a40ac5688a5850
Languages
Java
55.6%
Kotlin
43.5%
JavaScript
0.3%
AIDL
0.2%
CSS
0.2%