[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3

Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57