Merge "PersistableBundle: writeToStream/readFromStream"
am: 0204e4a08e

Change-Id: I52a1323e4157a0c967c301d48a646ea6ba94647c