[automerger skipped] Merge "Merge "HealthServiceWrapperAidl fix NPE" into...

[automerger skipped] Merge "Merge "HealthServiceWrapperAidl fix NPE" into tm-dev am: cf94069f am: c342eb60" into tm-d1-dev-plus-aosp am: 37244897 -s ours

am skip reason: Merged-In I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a with SHA-1 30f2c782 is already in history

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



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