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 am: 065b8b58

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



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