[automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: e1df4292f9 am: 0e5641d26c -s ours am: 16caff3ab3 -s ours am: 0fd5b6a3b1 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 8f56a69b9d is in history
Change-Id: I5e2b591a9cad882c8b00b4cf7e7a17674a53b838
This commit is contained in: