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

Change-Id: I549c2e79a7c22e9d140354692348bf0f65472c59