[automerger skipped] DO NOT MERGE: Fix interaction tracking logic am:...

[automerger skipped] DO NOT MERGE: Fix interaction tracking logic am: 0e2acaf0 -s ours am: 915b1626 -s ours am: b0417f5a am: 06a4abef am: 3722f470 -s ours am: d1759ba5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If349708dd5cf81aa0000a6c87ebbbf334eea7e15