[automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours

am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I64f33c660d24075e5eca1aa075b04a6655dc5053
tree: 51554ec194abae52475d22a2a3a994fb0795259d
  1. Tethering/