Merge changes from topic "am-9035a865c3eb4e07b9f204aecacd99dd"

* changes:
  [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e90 -s ours am: fb39ec42 -s ours am: 5312a5ef -s ours am: 8b727bd1 -s ours
  [automerger skipped] Remove stale aidl-export references am: d386543a -s ours am: db05a438 -s ours am: abd2ee71 -s ours am: a26b703d -s ours