Android security 8.1.0 release 84
Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: If578dc653c6e7e2ddb5f0d75edb8e786f0c094d4