Android 8.0.0 release 30
Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" am: 50b0c33452 am: 01f7ad0983 am: 404ddd4dfd
am: 09fc3d3949

Change-Id: I13174e96569a6da676eb3255e2dc93edd2ba926d