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

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

Change-Id: Ia0cb13395db6f1f305fe041d418130c31cc886e8