Merge "Track whether we've logged the "intercepted" state of a record." into...

Merge "Track whether we've logged the "intercepted" state of a record." into tm-qpr-dev am: 82dc9cb0

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



Change-Id: I8a2074851f7cabff839c4570e346205f6b03d55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>