[automerger skipped] Merge "Fix the source crop for screenshots for notch hide" am: 0a75a6ae0e am: 095079c06a -s ours
am: cca92411eb -s ours
am skip reason: change_id I675be4d1fb2386f24ead69a77b08bec65d2f5d47 with SHA1 adb75f485d is in history

Change-Id: Iad8fe27214f1c197b1a2ee6be6a17357a8f00715