Merge "Fix issue in InsetDrawable where master inset attribute get ignored....
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/37752336" into oc-dev am: 52eba0ad
am: 3c69ff32
Change-Id: I146034df4aaf54d137897855f60133859deb45cc