Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev
automerge: 91a1a72

* commit '91a1a7296b776400b9c863ec094cd135614c6fbb':
  Clean up GradientDrawable styled attributes, fix useLevelForShape