Merge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4fe
am: 8d36beec24

Change-Id: I76ac103f2d6df4a32a49c0c460344a8049d7d3c3