Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev
am: b896ad8555

Change-Id: Ifd9ae714200408d36be127401f46a0e125b0523e