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

Change-Id: Ibf6ed0d9e68c04ad2953720e1f1a80da16088ae9