Merge "Support BR_TRANSACTION_PENDING_FROZEN" am: c3b4ed369e am: 7b6b8b4ce9

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

Change-Id: If40b7e2026e3ff4c5749ae14c4a698c6028fe4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>