tree babc5ff1fbd1df91d667285044420d87ae822626
parent e53f88d29d93f28b8ba4a76e69937edc5a9377f5
parent 54a25b2d7cd8eabc00ec0b6fdf7524c268ff3f6d
author Steven Moreland <smoreland@google.com> 1635290204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635290204 +0000

Merge changes from topic "health-aidl" am: 713d22e0f1 am: f802438361 am: 54a25b2d7c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861824

Change-Id: I6e940902dbd08b30f54fb06c970743a8aa3b34ca