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: 86a6b604 am: 0a514caa am: 2515c341

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



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