Merge "Use profile at framework/base/boot/ instead of the combined one at...

Merge "Use profile at framework/base/boot/ instead of the combined one at framework/base/config" into main am: 1a072d35 am: 4616aeec

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



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