Merge "DO NOT MERGE: Crop the real height of status bar when taking preference screenshot" into oreo-cts-dev am: a6be3b7154  -s ours am: 334f5cbcdc
am: b7046fd585  -s ours

Change-Id: Ia47bb1ec3558097910344ebafc8e652b87a72bd7