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

* commit '57601a427ea58e17acdddba2b8eeda596937293c':
  Fixes and improvements for SerializationTest