Merge "Fix SearchView measure for UNSPECIFIED height." into nyc-mr1-dev
am: b9da1878fb

Change-Id: I44a66b4b58ea7cf8b55b4ab45772106fd5700711