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

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



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