Merge "AIDL effect: add version for draining state support" into android15-tests-dev