Merge "Add a new carrier config that supports no-reply timer of CFNRy" am: 833a6276ed
am: f20603af28

Change-Id: I89165fa40238a7e8280091bd94fef40550f4eeea