Merge "Merge "Only save focus in keyboard navigation clusters when...
Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am: f14aea9f" into oc-dev-plus-aosp
am: 4b5e7163
Change-Id: Iabddf8006df6b06eaa6349d8299259f5f3496146