Merge "PersistableBundle: writeToStream/readFromStream"
am: fe1ec91532

Change-Id: Ie899a26445753a5a6c131c825985044ecc35330d