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

[automerger skipped] Merge "DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction" into tm-qpr-dev am: f1764b7f -s ours am: 49e51b4d -s ours am: 4591f2b6 -s ours am: 0fb1fb9b -s ours

am skip reason: contains skip directive

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



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