Merge "Remove unnecessary drawing commands when drawing shadows." into sc-dev am: 4a9869c3 am: c15e6170

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14627986

Change-Id: I5bb36fef668e9d91eca3760bad9419b6ba718338