Merge changes from topic "am-b023c4441e584a90b106107a6621cd5d" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "sdk-refactor-tmd" into tm-dev am: e59bd2aa am: 8664fe16 am: ee23802f -s ours
  [automerger skipped] Remove unused dependencies from sdk goals am: 09fc47b6 am: 3a109e9a am: c57e6c07 -s ours
  [automerger skipped] Remove notice file for sdk system image am: a0ab4538 am: 3acd0165 am: bce06851 -s ours