Merge "Make PersistableBundle a stable parcelable." am: 0f56c2b4ba am: 3bf5cc8b88

Change-Id: If41e8d0b648b5712c92be19a0977784a0c6a9df3