Merge cherrypicks of ['googleplex-android-review.googlesource.com/21160269',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21160269', 'googleplex-android-review.googlesource.com/21266751', 'googleplex-android-review.googlesource.com/21238189', 'googleplex-android-review.googlesource.com/21398181', 'googleplex-android-review.googlesource.com/17695053', 'googleplex-android-review.googlesource.com/21318377', 'googleplex-android-review.googlesource.com/21740099', 'googleplex-android-review.googlesource.com/21537729', 'googleplex-android-review.googlesource.com/21574889'] into security-aosp-sc-v2-release.

Change-Id: Ie9ab81b8db09222d26d5346866554a621c83d133