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

Change-Id: Ia3eee0ca9efb619b2476075b8d7af173c332fcd4