Merge "Use drop shadow for screenshots instead of scrim" into tm-dev am:...

Merge "Use drop shadow for screenshots instead of scrim" into tm-dev am: 75cfd645 am: 7e9f4828 am: 2e475f9b

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



Change-Id: I36372efdbb1f43d4889fa4fe396a6701d112571a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>