Android P Preview 3 (PPP3.180510.008)
Android p preview 2
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp

Change-Id: I8bb962b0adad705473a9ae8f82f4cda3fd484d07