Merge cherrypicks of [17416116, 17416117, 17416118, 17416119, 17452466, 17666662, 17875442, 18087662, 18298311, 18297726, 17646532] into security-aosp-sc-release.

Change-Id: I1e00db0dd73bfb332f24238bfe1ce04c11c84b5e