Merge "Don't depend on art's boot-image-profile.txt in thin manifests" am:...

Merge "Don't depend on art's boot-image-profile.txt in thin manifests" am: 3bbbe3f0 am: 31716769

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



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