Android 8.1.0 Release 67 (OPM8.190605.005)
Merge cherrypicks of [7293853, 7292376, 7293922] into oc-m8-release

Change-Id: I6f6e83623d83f0859a138fe637ca4e97c1f10f92