[javelinanddart]: Forward port to ril-caf on lineage-15.1 Change-Id: Ifeeee11ee83deddb8eff565847641c45a105378f