Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: a7fdfa81b7" into nyc-mr2-dev-plus-aosp
am: 0e47080499

Change-Id: I876a1cc6314762f92623e2c319a96a61dae183bc