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