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

Bug: 264720040
Merged-In: I73e8c7d771a0af367b4302ea4d36996ee5684197
Change-Id: I71ec6ff9e5594f1064d6b74ef3b7146c42366abb
tree: a3b9d22b61a16e7c0ee74f312daace567a85ac58
  1. .prebuilt_info/
  2. 3/
  3. current/