Merge "Fix: Double-free error on RemoteFillService"
am: 5b04f89343

Change-Id: I7e8872a28ee01f29710945ac692236fa94f3c13a