Android security 8.1.0 release 84
Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92