Merge "BitmapDrawable: Suppress errorprone warning"
am: 25e50ccccb

Change-Id: I085cfc11effb8f067bd8fc122ec88bd6c44a2525