Merge "Don't report metric for no escrow data" into main am: 1407119421

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

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