Merge cherrypicks of [15151695, 15151716, 15151891, 15151892, 15151894, 15151896, 15150908, 15151384, 15151699, 15151700, 15151701] into security-aosp-oc-mr1-release

Change-Id: Ib577512a4d38e7111f1c13feba1c58f478c6c458