[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" into qt-dev-plus-aosp
am: bab71e05 -s ours
am skip reason: change_id I07983ca596443a3e00616b63355c6504376f3e7c with SHA1 7ff16257 is in history
Change-Id: Iab6e532ff10ea82e6f7e75f421f1ccde48b4fbcb