Android security 8.1.0 release 84
Snap for 4399693 from 1e3c9b44a790c4f5e784c9a72afeb2eaac61ee93 to oc-mr1-release

Change-Id: Ie065d198c44669549e806da106d866b7a829c843