Android o preview 2
Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" am: 50b0c33452 am: 01f7ad0983
am: 404ddd4dfd

Change-Id: Ia002c42b3c076a76d64973be755e5648c80c51b8