Fix SearchScaffold flaky when close search box

AppBar's max height is calculated based on title's size, when the search
box is closing, this calculated value could be changed to smaller value
than default, which cause flaky.

Not set max height value less than default to fix this issue.

Also import the following upstream change,
https://r.android.com/2617890 Guard against NaN at the TopAppBarLayout

Bug: 284913888
Test: manual - click search, then close, observe
Test: unit test
Change-Id: If733535487da46cc15abfaa453355acd9a172097