Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: c1801c9a8d

Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27