[automerger skipped] Merge "[QPR1] Fix dismiss not working in landscape" into sc-qpr1-dev am: e64c264c am: 05e85158 -s ours am: 6712ad81 -s ours

am skip reason: Merged-In I6b24b1f9d301d37749dc67c95392fd6c8451df00 with SHA-1 54743593 is already in history

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

Change-Id: If3c02edcd56026739732f0594a2286fd2120f1fb