Merge changes from topics "15_apis", "set_get_properties" am: faae7808 am: 3fbb156e

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



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