[automerger skipped] Merge changes from topics "15_apis", "set_get_properties"...

[automerger skipped] Merge changes from topics "15_apis", "set_get_properties" am: faae7808 am: 3fbb156e am: da46ce36 -s ours am: 3a3b59a5 -s ours

am skip reason: Merged-In I7f11230398183a54a766d0b6c19a0e36dae70d6d with SHA-1 24f9dfaa is already in history

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



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