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

Change-Id: I454f7c7c16fad7e708552304002ec30b35dc6b06