Merge cherrypicks of [15800897, 15800899, 15800901, 15800903, 15800905, 15801007, 15800676, 15800678, 15800969, 15800800] into security-aosp-qt-release

Change-Id: I7a7f861e3b369240547fad31ee5f59af25aca618