Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev am: 640d4d5f43
am: f29cd1b9b9

Change-Id: Ibcd71263f4d6a32b3961b9eac044cf550c9dd8b8