Merge cherrypicks of [16011302, 16010621, 16011379, 16011380, 16011397, 16011399, 16011401, 16010622, 16011572, 16011573, 16010922, 16011433, 16011690, 16011381, 16012427, 16011576] into security-aosp-sc-release

Change-Id: I0dbb6d86bd910625a8e72e4ca4ac81f6f145c484