am d387c0ad: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev automerge: 660504a

* commit 'd387c0ad28ab75ede6039e763ba098e714075387':
  Fixes and improvements for SerializationTest