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

am skip reason: skipped by user evanlaird

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

Change-Id: I9c2b201fae9af03245ccb9180363d28b0ae25e05