Merge "Fix cts verifier crash when test Policy Serialization Test" into marshmallow-cts-dev am: a9df99be8a am: 49c8e36170
am: bcc1dabc48

* commit 'bcc1dabc4817b811b9e9ef3dea7a9dab717f2809':
  Fix cts verifier crash when test Policy Serialization Test