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

Change-Id: Ic5d834fab229a0c24aad0a8aea361ed125170a9a