[automerger] Merging ScrimView into GradientView am: a0465afe8d

Change-Id: Idb42428806ae6c26326cb98071bc2ecb5585e025