Merge "rename hidl_enum_{iterator,range}" into pi-dev-plus-aosp