Merge changes from topic "update-androidx-ae"

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