Merge "Don't blend front scrim on AOD" into tm-dev am: dc65d350 am: 995561f1 am: eccac0a9 am: a36306d4

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



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