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

Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec