Merge "hikey960: Update manifest to soundtrigger 2.3" am: 47f3bff5ed am: 6e45f84302 am: 128bc85dcd

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1853674

Change-Id: I6ea5006e69954ccd6aa3ac9e34c35ff06df3d6aa