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 '4ea2f8b0c4f8ace032b1ffa684b33db5a9692cb3':
  Add CTS test to verify that custom properties of injected Java object are cleared on reload