Merge tm-qpr-dev-plus-aosp-without-vendor@9467136

Bug: 264720040
Merged-In: Ifee18c77b5a6bef4f115cf445e642e7b4fd09211
Change-Id: Id3261020fa39ae63ffe86262eeeaa49e40a9a3e2
tree: a9378a742f274c08f47e2efc792dfea02cb3121d
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS