Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp

Change-Id: I529a9d0b170656e1acc62909c328d304b6b15546