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

Change-Id: I08a9a5327c31f1541d6a455d4d57003bf87274c2