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: I36e9eb1da9746df9e83c9f473832242824af7f31
Change-Id: I36e9eb1da9746df9e83c9f473832242824af7f31
(cherry picked from commit e7c764a2)