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

Change-Id: Iea0000de2f9c0c683e6708b42ebbc5e5d05b7ceb