[automerger skipped] Fix potential double destroy of AssetManager am: 93320661ca am: aefc05c016 am: 8e5d6a25b2 -s ours
am skip reason: Change-Id Ia938502d2443f5a6de6a3cabdb7ce1d41d3ff6d1 with SHA-1 0a8a1e9d40 is in history

Change-Id: I2d759d07f9ba1e28ee9449161f823354b31f8a13