[automerger skipped] Added 15 APIs support am: 6b61fa0a am: cca8336c am: 1b8441fa -s ours

am skip reason: Merged-In I8f7fa5a14b5495dec496c77c8c54e0dce70d2001 with SHA-1 323f44c7 is already in history

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



Change-Id: I03c7982b0b4e76318edbd824941a83cf4fa48997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>