Merge "Remove useless variable "mapbase" from screencap" into main am: eca99eca am: fc0bcc16

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2647804



Change-Id: I76660662c8d5d4ea8f3aedc33227478316c2b287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>