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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4040a2ed40d990b4b6e6e87d6c48ba40e6a3c6a5