Merge "Merge "Move GradientDrawable stroke fields back to grey list" into qt-dev am: 2516b14955 am: f6ff9ab3b5" into qt-r1-dev-plus-aosp
am: 4e4d0eb90b

Change-Id: I22c0b014c16f094a36764e9713acb40515c6ebac