Merge 73844559 on remote branch

Change-Id: Icb7de607b7b50937b15dabcac816c0c91e759e6c

manifest.xml

@@ -457,7 +457,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.lpa</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.2</version>
         <interface>
             <name>IUimLpa</name>
             <instance>UimLpa0</instance>
@@ -968,16 +968,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>embmsslServer0</instance>
         </interface>
     </hal>
-    <!-- SlmAdapter HAL service -->
-    <hal format="hidl">
-        <name>vendor.qti.hardware.slmadapter</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISlmAdapter</name>
-            <instance>SlmAdapter</instance>
-        </interface>
-    </hal>
     <!-- MwqemAdapter HAL service -->
     <hal format="hidl">
         <name>vendor.qti.hardware.mwqemadapter</name>