Merge cherrypicks of ['googleplex-android-review.googlesource.com/23563580', 'googleplex-android-review.googlesource.com/23728493', 'googleplex-android-review.googlesource.com/23545068'] into security-aosp-tm-release.

Change-Id: I45da8cc8ba14f6d2d9bcfb42adbbb18659bc0c54