Merge cherrypicks of [17777241, 17777138, 18119099, 18030838] into security-aosp-sc-release.

Change-Id: I804a4db5a6b55d1dea35ecb7312b63399eb0e066