Merge "Add @deprecated annotation and bump netd_aidl_interface" into main