Fix CompatChangeTests on PC CF
On PC cuttlefish when resizing the display from 0.5 ratio to 2,
because of the sudden display change, the activity doesn't go back to
its original bounds on restoreDisplay() and the test fails.
In this CL a new restore display method is introduced that waits
until the display goes back to its original metrics.
Bug: 200058556
Bug: 212643054
Test: atest CompatChangeTests
(cherry picked from commit 3965326ea1c11d968e52ac84cca9cb1ce89a3b2f)
Merged-in: I0232b41797cf815d557f9353edf4ba8769624b20
Change-Id: Ibab4c7e44ddbdfbae0ee0c7a533a759cf472c8ac
2 files changed
