Merge "Don't store customizations separately." into main am: eabea054be am: 56b93d1e4c

Original change: https://android-review.googlesource.com/c/platform/development/+/3106390

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