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

[automerger skipped] Merge "Merge "HealthServiceWrapperAidl fix NPE" into tm-dev am: cf94069f am: 39c54296" into tm-d1-dev-plus-aosp am: c26ad94d -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: Ied091f38593a9d543e8c510bd8b48370a63e40c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>