Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev

* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.