Merge "Unbind autofill service when the service package is updated." into pi-dev
am: c84542c9ce

Change-Id: I3ec55e25994bd43a062673e28ddf01ca2237d741