Copy over the wrapped drawable's bounds in wrap()

Also ensure that we don't have multi-nested drawable
wrappers on L+, there is no need for them.

BUG: 25488702

Change-Id: I6b2d2a8f03abfad7fafd5e0eb4f77349b4f2c381
2 files changed