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

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

Change-Id: I22811b3be84ab39087393cff4c9974a320a46f1a