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

* changes:
  Freeze framework manifest for T. am: e05a232392 am: 004871e36d am: 0485f3bde5
  Freeze framework manifest for S. am: 7ae3308337 am: 391500bdd2 am: 3754ca8531