Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d2a

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

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