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

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

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