Merge "Merge "Add NonNull in Carriers constant" am: 40c918b924 am: 2c9b7a4a2f" into qt-dev-plus-aosp