[automerger skipped] Merge "AIDL effect: add draining state support" into main...

[automerger skipped] Merge "AIDL effect: add draining state support" into main am: b2b0ce95 am: 363e4e56 -s ours

am skip reason: Merged-In I2ca25cd085d1b6ae6cf8b0d1b58cd713aef0f7e5 with SHA-1 16b799f6 is already in history

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



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