am 019c52fd: (-s ours) am 4ea2f8b0: am 92693ba7: am 5db72e33: Merge "Add CTS test to verify that custom properties of injected Java object are cleared on reload" into klp-dev

* commit '019c52fdf2413aa25bf2cbc62356d5c9d7f9c6fb':
  Add CTS test to verify that custom properties of injected Java object are cleared on reload