Android Wear Hematite Developer Preview 2 (PWH1.180422.008)
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp

Change-Id: I8bb962b0adad705473a9ae8f82f4cda3fd484d07