Merge cherrypicks of [15541535, 15541187, 15541188, 15541497, 15541189, 15541499] into security-aosp-oc-mr1-release

Change-Id: I496e2eda4b0c82c19f5b98089ba63a34bfd5dce4