Merge "Don't blend front scrim on AOD" into tm-dev am: dc65d350 am: 0b38b3dc am: 6a363a33

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



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