Android p preview 2
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk

Change-Id: I74012820a8b8efad7b5e1f43291489a430ed487d