Merge cherrypicks of [14126780, 14127201, 14128410, 14127515, 14128647, 14128745, 14128746, 14128251, 14128748, 14126431, 14125341, 14128805, 14128806] into security-aosp-oc-mr1-release

Change-Id: I2d39374a8240b1084f53716da8366d14f4a721be