Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD
am: 5d32321b0b

Change-Id: I8e24147b4a7ec42c7fb58d36bd9e2c2d80fe9271