[automerger skipped] DO NOT MERGE: Fix interaction tracking logic am: 0e2acaf0a5 -s ours am: 915b162667 -s ours am: b0417f5a31

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

Change-Id: I2c2f569436efd95ddc4310583b8e1e22dcec7f5b