Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: Ie8f088ed078e88aab77b963cf34d7975ffff913d
Change-Id: Idc1f5a025418677bb3a2b15cc073abdc995edf8c
tree: c41f22cfd92c24bc61f75a2bec1c54bee7299baa
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS