Merge "Fix WmTests for devices with ro.bootanim.set_orientation_<display_id>" into tm-qpr-dev am: 4fc510679e

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

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