[automerger skipped] Merge "Mark updatable APEXes" am: 067c45b1ee am: b76ef78c49 -s ours
am skip reason: Change-Id Idb55300a60a261c7bb6359439ed220ff51fcf06c with SHA-1 477b4734f5 is in history

Change-Id: I43abc46bda66434d5a35afc09676d085ba8c3ea0
tree: 7e6b86e70c7d40ad2238f940d5fa46eda8b1668a
  1. Tethering/