Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27 am: f1e69505" into qt-qpr1-dev-plus-aosp