Merge cherrypicks of ['googleplex-android-review.googlesource.com/24112148', 'googleplex-android-review.googlesource.com/25648374', 'googleplex-android-review.googlesource.com/25715852', 'googleplex-android-review.googlesource.com/25787790'] into security-aosp-tm-release.

Change-Id: I95d58dadc85062017a412e1b1bfd334683dec541