Merge cherrypicks of [19524923] into security-aosp-tm-release.

Change-Id: I7ff1a39068cace6d3353ee2a806881f11dc5337e