[automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours am: cafb176e27 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history
Change-Id: I5e2b591a9cad882c8b00b4cf7e7a17674a53b838
This commit is contained in: