[automerger skipped] Merge "Add min_sdk_version:R to updatable apexes" am: c280c85504 am: 6478508103 -s ours am: 21d19fb617 -s ours

am skip reason: Change-Id I4a893c34b09334eea124266287301e479b9e8a59 with SHA-1 f1460fad52 is in history

Change-Id: Ibfccae23c4d0e353f6350a50a3f823389a53e28b
tree: bc5930915640723ba079c8244660ad132fc56cb6
  1. Tethering/