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

Change-Id: Ib826a02983a01ad3fe09c822158cf0bc17cdabaa