Merge "Can declare 1p without cycles." am: 04d5903f am: e26da42c

Original change: https://android-review.googlesource.com/c/platform/build/+/2464668



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