Merge "Remove constraint inside SearchTarget to only allow one android primitive to be set." into udc-dev am: 99e08bc3 am: 0446a461

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



Change-Id: I7aeca7f0a85df454b29ceae3b2e1d32eefeb5da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>