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

Change-Id: Ia7da9569b03f596805bf705b458daf28901e2ae0