am 1143cca3: am 6acb521f: Merge "Update local state when creating...
am 1143cca3: am 6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
* commit '1143cca3':
Update local state when creating LayerDrawable from constant state