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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief315674565dd6ba825b26045522c2c9cdd1b7cc