Merge "Merge "lshal: update test manifest to 2.0" am: 5a99fe853e am: 4c89b924ef am: be9c62877b" into qt-qpr1-dev-plus-aosp
am: bdba6021d7

Change-Id: I9d911cc065c481f428a479430db9978d18017357