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