Merge "Add metrics for software and external source detections." into...

Merge "Add metrics for software and external source detections." into tm-qpr-dev am: 52f51d89 am: 313d927a

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



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