Merge "Fix divider dismiss position wrong on potrait" into tm-qpr-dev am: d36b472c am: 37705543

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



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