[automerger skipped] Merge "Update Chooser shadows to match Launcher." into tm-dev am: bf068a06 am: e349703e am: 3a8183eb -s ours

am skip reason: Merged-In Icca36fe8c5771041bea960478c2be85f0679dc8d with SHA-1 e5b168ac is already in history

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



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