Merge "Revert "Add anomaly reports to check if IMEI is null."" into tm-qpr-dev...

Merge "Revert "Add anomaly reports to check if IMEI is null."" into tm-qpr-dev am: a443c8bd am: cedd8daf

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



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