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

Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c