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

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

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