Merge "Avoid un-registration when mRealInstrumentation is null." into tm-qpr-dev am: e70c76e281

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

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