Merge "Add tests for unique id in AIDL program info cache" into main