Merge "keymaster: fix authorization set serialization" am: 0cad4822d5
am: fd62cdf4b1

Change-Id: I9738c103b66b13de986fa6b590bdbc0b8b5d6afc