Merge "appcompat: Fix testDrawerHeight without status bar" into nyc-support-25.1-dev