[automerger skipped] Merge "Remove framework code that has moved to...

[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 79b6ad73 am: 37413a4b am: 1965d49e -s ours
am skip reason: skipped by user huangaaron

Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec