Merge "DO NOT MERGE: Update ActivityRecordInputSink using the pending...

Merge "DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction" into udc-dev am: bc4aef61 am: 42568a53

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



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