Merge changes from topic "aidl_tostring" into tm-mainline-prod

* changes:
  [automerge] Add JavaDerive toString to AIDL classes 2p: da10904e96
  Add JavaDerive toString to AIDL classes