Merge "Don't animate scrim changes to UNLOCKED if we're occluding." into tm-qpr-dev am: 3f5a0847

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



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