Merge "Fix MemoryLeak warning in frameworks/base/services"