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

Merge "Revert "Change override displayFrame to mBounds"" into tm-dev am: 0be7f74a am: bf0c7637 am: 041df63c am: 352665cf

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



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