Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am: 9b32a35aa7 am: bf30b430d4" into nyc-mr2-dev-plus-aosp
am: 14caf48e0f

Change-Id: I8d8b238eeade815ef6ad75cbc779bc0871d7dd7e