Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 14c76eba82

Change-Id: I5e0b4e50352428ca5886a808b5667daffb4f2e4c
tree: 176dfe0a8dee4fe899b12bbfa94777abe4e974cb
  1. core/
  2. services/
  3. tests/