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

Change-Id: Ifb5bc4da458c18daacd4f2c8eea62b496d820987