Merge "Merge "XmlUtils: Fix hex parsing in readThisByteArrayXml" into qt-qpr1-dev am: 2883327fba" into qt-qpr1-dev-plus-aosp
am: defbe4d33e

Change-Id: I2c00bc9087566de626666f82380d353c961c3ea7