Merge "Revert "Change override displayFrame to mBounds"" into tm-dev am:...

Merge "Revert "Change override displayFrame to mBounds"" into tm-dev am: 0be7f74a am: 7cbb7ad6 am: fdfea729

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



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