Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main...

Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main am: fa154fd6 am: 1fd4fea1

Original change: https://android-review.googlesource.com/c/platform/build/+/3205048



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