Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: 1831698768" into nyc-mr2-dev-plus-aosp
am: 426b84b35b

Change-Id: I98cdc7072e1fc95c0bb2893c12d7da1475d49f9e