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

[automerger skipped] DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction am: 806927c6 am: dae840d1 am: 167b2c11 -s ours

am skip reason: contains skip directive

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



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