Merge "SF: BufferLayer::onPostComposition display might be nullptr" into sc-v2-dev am: c6c6d99a6f

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

Change-Id: I5d8d765aa3aa9f8a7c7aa074f056c0736e4462df