Merge "[automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" am:...

Merge "[automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d am: 56602664 -s ours" into tm-dev-plus-aosp am: 82d1e324 -s ours

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

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



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