[automerger skipped] Merge "Add RIL Interface for UsageSetting" am: 7ed2706d...

[automerger skipped] Merge "Add RIL Interface for UsageSetting" am: 7ed2706d am: 06700db2 am: c1fff858 am: 36c40ce9 -s ours

am skip reason: Merged-In I936a2b49f09bec6ac4c2d4d2d1022015b2883d3f with SHA-1 84bac822 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1917537

Change-Id: Ifba6b3b9a5f3554f232f1b40de3dd0aa4f8a56d1