Merge "Tests for Parcel changes in frameworks/base"