[automerger skipped] Make display frame compatible am: 677078e8 am: 63b0b6e6 -s ours

am skip reason: Change-Id Ia61933120027642d1f0e0a490546071ca2b6c853 with SHA-1 507da8e1 is in history

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

Change-Id: I633dbddba0c2e6a83912591387846c46f2a3ac1c