[automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" into tm-dev am: cf94069f am: 39c54296 am: 163d5619 -s ours am: 26e8a9d8 -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: I4f1f77eae8abb22e63526cdb2c966662512760f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>