Merge "Fixing notification scrim shifted in landscape orientation" into sc-dev am: 4b5aa29c

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

Change-Id: Iffb7960f5b536cf431e93afdcba224e37a86232c