Android 12.1.0 release 3
Merge cherrypicks of [16738090, 16738091] into sc-v2-release.

Change-Id: I7625741c80ff4a3bbdf79eac51688126d6683225
tree: 9b29c1de32b4e1081a57fded11a84b07b7aa0b1d
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS