Android VTS 12.1.0 release 1
Merge cherrypicks of [16738003, 16738004] into sc-v2-release.

Change-Id: Iba216055b554c0476eee51ad6f867d0863953ccf
tree: 0fce9b6d45f4987066d3a188817d4e460990e854
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS