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

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



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