am 96182797: am bf329143: Merge "Make OTASP an explicit option for carriers." into lmp-dev

* commit '961827971b13dbbaecf8fc41592f955bdba86397':