Android Security 16.0.0 Release 4 (15019589)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32289328'] into sparse-14733871-L47300030087916391. SPARSE_CHANGE: Ica98d82d7d7c1c9c0defcff8d96bf5f36e8f5d36 Change-Id: Ie836a20574d4c95a25a827af8be061d78c62ba8f