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

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

Change-Id: I3cbb40247c97edd24249707f4d13d465162be2a7