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

Change-Id: I5fbd1ab8c8c9d3bcc6e1f334a1d96fe6df37a84f