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

Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41