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