[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

Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26