Merge "Correct Error reported to logcat when Plugin fails to load" into tm-qpr-dev am: 5c797b88e1 am: 7b94772ce9

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

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