Merge "Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am: cb93ac533d am: f2a3b8af49" into oc-dev-plus-aosp