Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 am: 6f399d2f9b am: 314cdb0db6
am: a3d5024960

Change-Id: I1b3274e93e6682db6e6910febfef60d4d24a749e