Merge "Fix the restriction of odm partition overlays" into main am: 2a49ddf673 am: 9220249061

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

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