[automerger skipped] Manage DropBoxManager using sp<> am: 4055c3f66b am: c2ed4f46bd
am: 21bfc14768  -s ours

Change-Id: Ifa1cea427c0e05e50f22d6a71a54f327e5cf6cc7