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

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



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