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

am skip reason: subject contains skip directive

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

Change-Id: Ie53aae568b2f8c829eb77c28d995470f62990ec8