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

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