Merge "Adding a system property to enable 16k dev options" into main am: 904c8194 am: 3ce34e4c

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



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