Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 2e21932172
am: bfc3f8a315

Change-Id: Ib6b400f4340da07a2bb2d75b2df6c4571f52350d