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

Change-Id: I41098d420d81a1747a17a3d2488fa8f1cf7d813f