Merge "Support surface only instrumentation" into sc-v2-dev am: d6d30bf7f6 am: 60894eefb5

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

Change-Id: I2f43c2ba720d08446210639cb417af6dd2bc1266