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

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

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