Merge "Fixed the comment of carrier config for CDNR" am: e994a0d66a
am: 6f7ccba005

Change-Id: I603d8168f425a419d8af261df9b4f732d49459a0