[Spa] Fix CustomizedAppBar height error

Although this height should not be negative from code, there still some
crashes happens.

Prevent negative value to prevent crash.

Also import upstream changes up to
Ibe64a4f96541f9379e43c137c6f4f30eeaf1794a

Fix: 322390811
Test: manual - with gallery
Change-Id: I7543b58cf458fc0d884bf2ac9bcafe1734171110