Android Security 8.1.0 Release 83 (6893677)
Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: Ic44a1dab2f79bf456089ce5ca31cbcb337f0cda2