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

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

Change-Id: Ibe3a526205ac64395517156311d9ca4b95dfb9a0