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

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



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