Merge "Remove NativeTestTarget." am: b3db690a48 am: 3a42fb2dee am: 66f19fa087

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6063de6300cd0a2274bbe8b32273239f8d5194d