Merge "Merge "Fix a crash caused by transaction" into sc-dev am: 7580a2dd am: dc57aa56" into sc-v2-dev-plus-aosp am: de5686d0

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

Change-Id: I09230a62e99d3607b4eb5c2d5deb570ac49d27ef