Merge cherrypicks of ['googleplex-android-review.googlesource.com/23185329'] into security-aosp-tm-release.

Change-Id: Ia64b8e358269e5d67da1de9932a02e19d36b38c9