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

Change-Id: I398a879b45a13127c6059986e002f6f4f6eabeea