Merge "Handle defer transactions on a detached layer" into rvc-qpr-dev am: 112da3a907 am: 4585657df9

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

Change-Id: I21330a3a6fc38fad4332c5ac8aaaba589079b1b1