Merge "Don't report focusableViewAvailable on add" into oc-dev am: 8d4b72c68a
am: 2b64c87366

Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689