Merge "fix: APEX prebuilts are disabled in platform build am: 895e224d am: 68fff508" into qt-r1-dev-plus-aosp