[automerger skipped] Merge "Add getDisplayViewport for screenrecord tool" into pi-dev am: 5ca4b905fe
am: 4c00ac3c7b  -s ours

Change-Id: I54268cc4b0a29afba95bde9625412cb51f82c94e