[automerger skipped] Update current API file rules am: 34c37ad82e am: bc2e30ecb7 -s ours

am skip reason: Change-Id Ice6ab935723a072dbb68c4fe32199f86ec4d983a with SHA-1 862b3d8314 is in history

Change-Id: I937b9f1e2fc274cdd80de0bf506922c0b1bd61f9
tree: 41df9aa68db679ddb8f7aa7fbcaa38b70b83ed29
  1. api/
  2. java/
  3. Android.bp