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

Change-Id: I0bf917bccbd2747ea18049577f5d79fe457eea4f