Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a0 am: 083df1ec am: 869646b5 Change-Id: I059547d4a8ed075c82cf483b2b226b3e337203c2