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

Change-Id: I331b4e0511fe70cb282d0dc0335617660ba3232b