Merge "PersistableBundle: writeToStream/readFromStream" am: fe1ec91532 am: b0fe59c396

Change-Id: Ic00c942a5e71fa016f1c55d249d1c237f3d1e0d8