Refactored DataProfile and ApnSetting

Merged traffic descriptor into DataProfile. Now DataProfile
becomes a container of an ApnSetting plus a TrafficDescriptor.

Bug: 196597630
Test: CTS && atest FrameworksTelephonyTests
Merged-In: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
Change-Id: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
(cherry picked from commit bbb11109)