Merge "Improved AutofillManager and Activity dump() methods:" into pi-dev am: c9443e3894
am: dde594d606

Change-Id: I611e2977b133f92da2fae2d54daf1e44aa60f3d4