[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60 skipped: aa9c801f89 am: 1fd506a340 am: bb0a801a85 am: dc288fc3ec
am: 9563da198b  -s ours

Change-Id: I661608e37de8811ba374dad184b3b49f284fa782