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: d890d4b8 am: 4588cd9a

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



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