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

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

Change-Id: I5bb2dc57e9108fb935c7d72ac290b53318a4709e