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