Merge "Rearrange/rename GlobalScreenshot methods" into rvc-qpr-dev am: 1785587c24 am: fd0a609cbe

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

Change-Id: I06811b3c0261a3fd57fff11b67bd9be11cd44ccf