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

* commit '660504acb29860588107fdf175768e9b036fd3ff':
  Fixes and improvements for SerializationTest