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 am: 11e59945

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



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