Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev
am: 5df216f209

Change-Id: I9ad8c851d9c634d26b470456dc07b26e15f61900