Merge "Revert "Change override displayFrame to mBounds"" into tm-dev am: 0be7f74a82 am: 7cbb7ad6f4

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

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