Test: atest TelephonyManagerTest#testIsDataEnabledForApn
Bug: 140763963
Change-Id: Icbb29124294972766f68533b7e23700dd491c075

[automerger skipped] Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109 am: d122386e am: 1e3288d6 -s ours
am: a069d000 -s ours
am skip reason: change_id I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24 with SHA1 66a5871d is in history

Change-Id: I6c70e6236d81d2fbfa42c3975248b0fd684edca8

[automerger skipped] Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109 am: d122386e am: 73e56642
am: 9532ad21 -s ours
am skip reason: change_id I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24 with SHA1 6eff1d43 is in history

Change-Id: I40fa7a0d9eee9dd143af86d3b1c604b006d1bd8f

[automerger skipped] Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109 am: d122386e
am: 1e3288d6 -s ours
am skip reason: change_id I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24 with SHA1 66a5871d is in history

Change-Id: I5146139032995e71408f013faaa2c9e5c08aa779

Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109 am: d122386e
am: 73e56642

Change-Id: Iec2373cf919710062ab9be2968afb02e3cf099ff

Merge "Merge "docs: Edited sharedUserId deprecation message" into qt-dev am: 35b69e2c am: 4250ee9c am: 790df682 am: 368c6592"

Merge "docs: Edited sharedUserId deprecation message" into qt-dev am: 35b69e2c am: 4250ee9c am: 790df682
am: 368c6592

Change-Id: I1d1ebbc0a074638758ab70a198caeddc26308e1f

Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109
am: d122386e

Change-Id: I679c0d4342a639abbe81af9d4351ccd0aa9f62f8

Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109
am: d122386e

Change-Id: I0e263f059a8a0d626a683c60a4c5f5f5028b0183

Merge "docs: Edited sharedUserId deprecation message" into qt-dev am: 35b69e2c am: 4250ee9c am: bc42ebbf
am: 8ea366e1

Change-Id: I9dbafb6ff4852c916eeab8e8bc190596cd675c23

Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev
am: 01dfc109

Change-Id: I0c7f975dfd910d7c8773bbf3a46086bbca82c7a4

am: 790df682

Change-Id: If37d42d5cebd18be1f83d6e0f31b66c673ac81bb

am: bc42ebbf

Change-Id: Ia3a5fbd7ec55ec2ea37a18109a3675d3ac3550af

Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev

am: 4250ee9c

Change-Id: Ifeaad657c6662fb680e208ae7558faad26459eb3

am: 4250ee9c

Change-Id: I89f68ac5747386c1458d425254a468b528f8c0fe

am: 35b69e2c

Change-Id: I5f1fbce04b8e7f70d623e15dce2c13d122cba95c

Add NETWORK_CLASS_5_G to TelephonyManager
Add NR to ServiceState

Bug: 135421985
Test: atest FrameworksTelephonyTests
Change-Id: Iaed46354400c7a1ce410eebc246892d7edf448dc

Test: NotificationManagerServiceTest
Fixes: 142157313
Change-Id: Ied9c4c014227985eb460c6f984d30ca1e934a6ad

Test: look at logcat
Change-Id: Icf36d1d3132f6541d81d21eb53b96e302e45f1f3

am: 26cbc323

Change-Id: Ibfadeb45ea790db0ce9db52d7e008f19eea7fba2

am: f4e2a8c3

Change-Id: I1061d467831e006fed7cbe4898c1fb3749a54160

am: 7f206339

Change-Id: I7d387b6959d9fed06b838f0b129edff07e6daf00

am: 4e4890a3

Change-Id: I4ebd814f61585ebd9358fa82cc0478fdb8f8e038