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

[automerger skipped] DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction am: d07e2cfe -s ours am: f8ab3016 -s ours

am skip reason: contains skip directive

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



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