[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ce am: 30a70587 am: 85727109 skipped: 15a3e59d Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1