[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f am: 7db4a90e60

Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753