Merge cherrypicks of [14947191, 14947212, 14947132, 14947133, 14947450, 14947331] into security-aosp-oc-mr1-release Change-Id: I0cb16dcc78c625a42beff819e8465a9d68c8c88c