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

Change-Id: I8823618f688d781f5a96549da695b45b0f561878