Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a08e am: 083df1ec90 am: 869646b5ab

Change-Id: I059547d4a8ed075c82cf483b2b226b3e337203c2