[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: b4cc036c1e
am: 82248bfdd2 -s ours
am skip reason: change_id I6ee12e9914503a5b628ae6da82a396aa71dd972c with SHA1 3bebef5184 is in history

Change-Id: Ieb4a652de31fe3c490ed2faa72919b31b7ff0782