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

Change-Id: If3bd5283f45426412e029cb4c943b855b4b67a63