[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 0122cf102f am: 2deb148476 am: f331b80dec -s ours
am skip reason: skipped by user huangaaron

Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec
tree: c14511148ac2291c5c1eed71ac749a9a72a3f230
  1. core/
  2. services/
  3. tests/