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

Change-Id: I4857bd3b5e5d9c3ec16c949424eab743e621e4f5