[automerger skipped] Merge "Add individual API tracking files for modules" am: 4dd8a42cff am: 5f6db2c1f9 -s ours

am skip reason: Change-Id Iaf2ef5b5751eb208d119ddbc74481239366fe581 with SHA-1 49bdf5615f is in history

Change-Id: Icf93c1b23cfd39d899ba517ec6940b1cbd1991cb
tree: 6e7000572c8771bfe3a0b38724f163e22b8cb6f2
  1. Tethering/