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

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



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