[automerger skipped] Merge "DO NOT MERGE: Update ActivityRecordInputSink using...

[automerger skipped] Merge "DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction" into udc-dev am: bc4aef61 am: 42568a53 am: 25aa16fe -s ours

am skip reason: contains skip directive

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



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