Reland reset on package remove with autofill fix

Test: atest FrameworksServicesTests
Bug: 304815869
Change-Id: I719c5f9b80723967602321b82fbf889fd5e105f9
2 files changed