Merge "Change the instrumentation app build target type" am: 4adb372fc7 am: a8fc52d7f5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9c6a12b7e8f68a13c5c0caa96621e155847ff3a