Fix NPE in DrawableCompat

Also copy over the wrapped drawable fix over to
API 22.

BUG: 25814094
BUG: 25488702
Change-Id: Ic9c0aa603ca42d9971e99b19f692414e6dee7454
2 files changed