We shouldn't assume that mDefaultFocusHighlight being no-null means
that we should draw it because we don't tear it down when the view
is unfocused.
Also add a call to draw the default focus highlight in the uncommon
case where steps 2 and 5 can't be skipped.
Bug: 148296147
Test: manual
Change-Id: I827abdfa9f64edeb6e6c232f71db3784c29fd0a8
6dea70b9fa